From: awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Date: Mon, 15 May 2006 20:12:07 +0000 (-0600)
Subject: [IA64] Get rid of dcr bit 63 trick.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16066
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=d9b8a3ff76084f5afd3853c3f64adb8e01eff291;p=xen.git

[IA64] Get rid of dcr bit 63 trick.

(Use ar.rsc.pl instead).

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
---

diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S b/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S
index c611974d78..818a3d249d 100644
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S
@@ -18,12 +18,13 @@ running_on_xen:
 
 	.text
 GLOBAL_ENTRY(early_xen_setup)
-	mov r8=cr.dcr
+	mov r8=ar.rsc		// Initialized in head.S
 (isBP)	movl r9=running_on_xen;;
-	extr.u r8=r8,63,1;;
-	cmp.ne p7,p0=r8,r0;;
-(isBP)	st4 [r9]=r8
+	extr.u r8=r8,2,2;;	// Extract pl fields
+	cmp.ne p7,p0=r8,r0;;	// p7: running on xen 
+(p7)	mov r8=1		// booleanize.
 (p7)	movl r10=xen_ivt;;
+(isBP)	st4 [r9]=r8
 (p7)	mov cr.iva=r10
 	br.ret.sptk.many rp;;
 END(early_xen_setup)